From 84aab1fc4db4721d714dca9451db910605faaa1c Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 27 Aug 2012 16:47:58 +0000
Subject: [PATCH] fix-system-lpsolve-build

Gbp-Pq: Name fix-system-lpsolve-build.diff
---
 configure.in             | Bin 412491 -> 412542 bytes
 sccomp/Library_solver.mk |   6 ++++++
 solenv/inc/libs.mk       |   6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/configure.in b/configure.in
index cde5d98b000b13098496668847aed81778e11d30..22c8d52a1d15e17e4b017afa2a90c72fc0cdfa04 100644
GIT binary patch
delta 74
zcmX>-P4eF~$%Yoj7N!>FEi5)Me98GaiMc5{3J`j_W(-TAsIHHGX>pN$PG*vRPC;>g
aPFZTKCfD?bGnpmYx5lt+-x|X@?HvH}6&tSr

delta 41
xcmex2P4e_K$%Yoj7N!>FEi5)M(_>>;;+SJKxu!py$t=<SB8FxAix}2v?*L7I5KaI9

diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index a889f4416e8..9bec4bd9dee 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -44,7 +44,13 @@ $(eval $(call gb_Library_use_libraries,solver,\
 	$(gb_STDLIBS) \
 ))
 
+ifeq ($(SYSTEM_LPSOLVE),YES)
+$(eval $(call gb_Library_add_ldflags,solver, \
+	/usr/lib/lp_solve/liblpsolve55.so -Wl$(COMMA)-rpath=/usr/lib/lp_solve \
+))
+else
 $(eval $(call gb_Library_use_external,solver,lpsolve55))
+endif
 
 $(eval $(call gb_Library_add_exception_objects,solver,\
 	sccomp/source/solver/solver \
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 9d2dd1e1e81..47cfaf27cb0 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -324,7 +324,13 @@ MYTHESLIB=$(MYTHES_LIBS)
 MYTHESLIB=-lmythes-1.2
 .ENDIF
 PYUNOLIB=-lpyuno
+.IF "$(SYSTEM_LPSOLVE)" == "YES"
+# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
+# /usr/lib gets picked and we get a static link...
+LPSOLVELIB = /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve
+.ELSE
 LPSOLVELIB=-llpsolve55
+.ENDIF
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest
-- 
2.30.2